video: add CONFIG_I2C_EDID and disable CONFIG_DISPLAY by default

Enabling CONFIG_DISPLAY breaks building for some architectures
(microblaze-generic), so we disable CONFIG_DISPLAY in Kconfig
by default and enable this option in defconfigs. CONFIG_DISPLAY
depends on CONFIG_I2C_EDID, so add and enable it in defconfigs, too.

Signed-off-by: Anatolij Gustschin <[email protected]>
Reported-by: Bin Meng <[email protected]>
Cc: Simon Glass <[email protected]>
Reviewed-by: Tom Rini <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
Tested-by: Bin Meng <[email protected]>
Signed-off-by: Anatolij Gustschin <[email protected]>

diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index 27e53c14c6c21cb6ac9eaebb08b04f6f2dbd156d..bd8b9649ced719e164f70dace0422c06db2061e3 100644 (file)
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -55,6 +55,8 @@ CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_DM_VIDEO=y
+CONFIG_I2C_EDID=y
+CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROTATION=y
 CONFIG_VIDEO_ROCKCHIP=y
 CONFIG_USE_PRIVATE_LIBGCC=y

diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
index 15eb4d87b9ffcf666f77be64e7057ac256b34277..3b29158f4acab6504f0acd5ed1d868db29c6aace 100644 (file)
--- a/configs/firefly-rk3288_defconfig
+++ b/configs/firefly-rk3288_defconfig
@@ -47,6 +47,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
 CONFIG_DM_VIDEO=y
+CONFIG_I2C_EDID=y
+CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROTATION=y
 CONFIG_VIDEO_ROCKCHIP=y
 CONFIG_USE_PRIVATE_LIBGCC=y

diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index 03348a6987a427e1fcfdad15dbda1f09ca43c6d1..ca0f9e067bfe853b5072810336bcbdc52cd74489 100644 (file)
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -26,6 +26,7 @@ CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_DISPLAY=y
+CONFIG_I2C_EDID=y
 CONFIG_VIDEO_TEGRA124=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_TPM=y

diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
index 2563775c6b759abaee00bb920c4c679d935a5480..68e3b367a33b2e46d932726c4fa2ceb38d2bfc55 100644 (file)
--- a/configs/rock2_defconfig
+++ b/configs/rock2_defconfig
@@ -45,6 +45,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
 CONFIG_DM_VIDEO=y
+CONFIG_I2C_EDID=y
+CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROTATION=y
 CONFIG_VIDEO_ROCKCHIP=y
 CONFIG_USE_PRIVATE_LIBGCC=y

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 4e706b7058e7f06b3d2d911725d6f01fa9f558cb..f54631cc17288e790a65e11610c344d7edbc7031 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -300,10 +300,18 @@ config VIDEO_MVEBU
        Support for the LCD controller integrated in the Marvell
        Armada XP SoC.
 
+config I2C_EDID
+       bool "Enable EDID library"
+       depends on DM_I2C
+       default n
+       help
+          This enables library for accessing EDID data from an LCD panel.
+
 config DISPLAY
        bool "Enable Display support"
        depends on DM
-       default y
+       default n
+       select I2C_EDID
        help
           This supports drivers that provide a display, such as eDP (Embedded
           DisplayPort) and HDMI (High Definition Multimedia Interface).

diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h
index 150e8765d642cb6664ea558c148f4a139aae8eca..67f45c0f908c36ac5f3687c08be007e7c836bed6 100644 (file)
--- a/include/configs/chromebook_jerry.h
+++ b/include/configs/chromebook_jerry.h
@@ -30,7 +30,6 @@
 #define CONFIG_SPL_POWER_SUPPORT
 #define CONFIG_SPL_I2C_SUPPORT
 
-#define CONFIG_I2C_EDID
 #define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_CONSOLE_SCROLL_LINES            10
 

diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h
index d6423e7e554d21bd989fb71d91613735741e8ce0..a29f55709dd815dd187b54eea724e0023ae473c5 100644 (file)
--- a/include/configs/firefly-rk3288.h
+++ b/include/configs/firefly-rk3288.h
@@ -24,7 +24,6 @@
  */
 #define CONFIG_ENV_OFFSET (96 * 1024)
 
-#define CONFIG_I2C_EDID
 #define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_CONSOLE_SCROLL_LINES            10
 

diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index 9464153f58460bf4332b2593ca0fe2f72409ceab..176f6e902b3b3f911eaa225da9bf7a509536eef3 100644 (file)
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -37,8 +37,6 @@
 #define CONFIG_SYS_MMC_ENV_PART                2
 #define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE)
 
-#define CONFIG_I2C_EDID
-
 /* LCD support */
 #define CONFIG_LCD
 #define CONFIG_PWM_TEGRA

diff --git a/include/configs/rock2.h b/include/configs/rock2.h
index d6423e7e554d21bd989fb71d91613735741e8ce0..a29f55709dd815dd187b54eea724e0023ae473c5 100644 (file)
--- a/include/configs/rock2.h
+++ b/include/configs/rock2.h
@@ -24,7 +24,6 @@
  */
 #define CONFIG_ENV_OFFSET (96 * 1024)
 
-#define CONFIG_I2C_EDID
 #define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_CONSOLE_SCROLL_LINES            10